Changes to build on ubuntu