Fixes for windows to vanish