Fixes to make linux build.