Fixes to energy extension -- now works on Rhea (only). Also, minor fixes to smb and clouds extensions.