Adding more things to make this work with windows