App map bugfixes