Code fixes to build for linux

Code fixes to build for linux