more fixes for windows file seperators