Minor windows changes