Merge in client access
Fix helpers