minor fixes to new api