Fixes to linux build.