Working changes for getting stuff working better, especially on Ubuntu 14.04.