Bug fixes for windows paths