Updates from Jennifer Monk to enable compiling w/o errors using XLC
18 files changed