Add the fixes recomecommend by IBM