More tweaks for the eclass