Fix legacy mode and map-t parameters