More updates to the build system