All tests passed e30438653a080acf5929c35c7802d40824dbae9b

Fixes to previous commits as found the code didn't link under optimisation.

Use the 'all-sources' tarball below, NOT the github generated one which is missing dependencies: