Fixes for maps and favourites, etc