Fixed some issues caused by updating packages.