First set of changes for windows