Auth, cli, mapping fixes