Fix some path issues
Merge branch 'hotfix/1.2.2'