Making the build nicer