Changes to work on 3.0.2 on EVAL