[jit] Pair of fixes from last merge.