More sizing improvements: Windows