Fixes in energy model