Fixes for #2236
Merge pull request #2239 from creocoder/aliases-fix

Wrong path fixes