Set of fixes for FABRIC and ENTESB issues