Minor changes to admin client.