Resolved some access restrictions