More access control and permissions

Minor changes