Final set of auth-3.3.1 suggestions