Clean up some warnings for Linux build; No functionality change