Mapview bugfixes