A few more fixes to get authentication working without a scene
being specified.