Fix API breakage