some more fixes to evaluation_stage