Minor fixes
Map improvements