Add missing evaloader specific changes from #2830