Some permission improvements in client.