Minor fixes for compile issues seen on Mac OS X

Change-Id: I4e0c556a8b95686a72b482663c74aa4ba46c18dd
Merge branch 'compile-fixes'