Fixes for Linux build.  Should work at least on Ubuntu now.