Fixed some build process stuff