Changes to support ubuntu 14.04