Call flow tweaks