Various fixes for the changes to the build system...