Changes to work on Ubuntu 14 (Linux Mint 17)