ENYO-2447: minors changes to be sure that it works on all major browsers