all the build fixes