Bug Fixes

Map and config related.