Fix more hamfisted find replace jobs