Make the build more sane