Small fixes to energia