COMP: Get rid of more warnings, this time from ICC

Change-Id: Ib45a0caabcccac33ef2ccc461f25c672ceed6d1b