Fixing compilation errors after refactoring.