Done several fixes across all maps