Minor window manager bug-fixes

It's tough to properly handle focus under all combinations of
docking/floating, but we're getting closer to a foolproof solution...