Changes needed for Ubuntu 14.04