Cocktail api fixes