Adds fixes for Ubuntu 14.04 problems