Add fixes to the build