Work on map files
Fix compilation