Rework fix for file separator on windows platform