fix up applicable calls a bit