More work on the build system