Small WM tweaks