Fix path name handling to work in current dir & be cross-platform