COMP: updates to accomodate the ICC compiler.