more small windows fixes