Minor fixes for auth-wrap while typing - thx Andrew :)