Trivial changes to build setup

Noted a couple of oddities when browsing through the build files.  Think both these are relevant / useful / improvements.