Linux compile fixes
p4#: 20663