Fix some compilation bugs.