Fix compilation errors due to merge