Fixes to map