Guest permission cleanup (fixes #906)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>