More fixes to handle Windows filesystem slash quirks