Commit 600. Fingers crossed. Everything seems to work more or less as expected.....