Make changes to add compatibility for Ubuntu 14.04