Slightly better coverage for maps.