Adding changes necessary to get the build working on ubuntu server