misc fixes for ibm code after merge