Correct some compilation bugs.