Fixes to build on Linux