Try to fix common map errors