Fixed API errors