Window render fixes