Fixes to the build