EC-EARTH specific tweaks