A few suggested changes after patch 1.08 (CW mainly)