Some adjustment for Windows and general behavior