call-only fixes