Eval stage tweaks