Profile installation fixes

Please see individual commits. The commit messages should hopefully be self-explanatory. This fix is meant for master, 19.x and 18.x.