Committing windows fixes