All tests passed b29317e02baaadf42f2e8466764ac7caa574ee3a

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: