Fix random evaluation issues