Patches attached

- Andreas