Fixing build issues with Ubuntu

Still having some build issues, but these seemed to get it most of the way there.