various fixes related to pip