Fix a few regreesions in MapWidget