EnergyNetwork fixes