All tests passed 5bf34fbf997e5f4f3551cbe8d335964a046c27f4

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: