All APIs fixed