Minor fixes to build system.