Fixing window manager issues