Really fix chan local races (I hope)