Hera fixes

Fix that were requested by Dominique Dumont

Enyo-DCO-1.1-Signed-off-by: johnmcconnell@yahoo.com

hope fully i did the right branch :)