Minor access control tweaks