Minor fix to path handling