Minor changes to work with windows