Fix windows changes