Window improvements.