Added windoor fixes. This was real torture.