Use pathSep more consistently