Cleaned up some build errors, should have done this in the last commit, sorry.