minor remap fixes

1 job for master in 17 minutes and 58 seconds (queued for 60 minutes and 46 seconds)