Fix pmbootstrap pull
Two patches to fix regressions from the big refactoring MR, and one patch that fixes a bug that I just realized has always been there :)
Two patches to fix regressions from the big refactoring MR, and one patch that fixes a bug that I just realized has always been there :)