small fixes for wm