Patches attached.

- Andreas