Minor changes to window manager return.