Api access fixes