Merge fixes suggested by CansaSCityShuffle