Changes for Ubuntu 14.04