uploads and map fix