Small tweaks and fixes.

Along with a build test after my boot drive died, and I've had to rebuild my PC from scratch!