More 'fixes' to window size.