merge fixes for the new api