Fixes for MapSerialize and fixMap.py.