Fixups to support ubuntu 14.04