More future val tweaks