Fix compilation errors for Map