[SAHI] patternFly fix and general fix