various tweaks to push API