Moved some WindowManager / Window calls around