Fix for RT not displaying for guests

Also some code cleanups