Minor access fixes