ENYO-2405: Pull request Remarks

Some remarks made in the pull request are treated and marked 'Fixed'. Other fix will follow as soon as the branch bug is fixed