Fix up login for render
Fix up some code