ENYO-3576: added some comments for future 'fixme'

While implementing ENYO-3687, somes changes will need to be made in those files. Added a fixme comment as reference.