Fix problem where privileged user gets cartesian product and can not install
Merge pull request #533 from jrogelstad/master

Fix things.
Added missing functions to instance