Fix bugs related to deps upgrades