Compilation errors fixed, but some unit tests will fail