Fix apt-get upgrade errors