wip -- Fixes to build the tarball on Linux