Map model fixes
Nearby fixes
Trimmed
Fixes