Fix some compilation errors. Still does not compile.