Cleanup and compiles fine on Ubuntu now...