Multiple changes upgrading to Mint 17