Fix maps from subdirs