ENYO-2405: some corrections