More window animation fixes