Updated some build related stuff