Added map changes for #925 and #655, props @Skillert