A few window binding changes