Fix some of the build