Fix typos in comments
Fix path separators used for directory check

The paths use '/' even on Windows so we just check for both backslash
and forward slash.
Merge branch 'directory'