KAZOO-596: backport these tweaks for MWI