fix issues for ibm.