Fixing the main classes of ehaupatras to execute again with new metrics.