Api access bug fixes