Changes to build on Ubuntu