more tweaks to apis