Additional fixes
Merge pull request #4998 from creocoder/aliases-to-bootstrap

Additional fixes for #4993