bring in Hiro's last wm class fixes of 0.7.0 to claws