API breakage fixes