Fixing spacing issues in Windows