Minor fixes to path handling

Closes issues #1 and #2 as discussed