Fix some build mistakes.