Several updates for the newer distros