Fixing various issues related to package dependencies