More fixes and try new access control method