more evo fixes