Fix some build derps