Small updates to build system.