Fixes to the build setup