Fixed eclass issues