Patches attached. None of which are meant to address the fate failure
mentioned by Martin.

- Andreas