Fixes to more winodw bounds