Fixes to build system.