fix some path variables
Merge branch 'hotfix/1.1.1'