fix issues
fix ibm issues.