callback tweaks