Linux compile warning fixes
p4#: 21189