Changes needed for Ubuntu Trusty Tahr 14.04