Fix some of the compilation bugs.