api fixes [ci skip]