Fixing silly errors in map