Fix compilation errors introduced by sloppy merge