Fixed saving/loading with new map format