Misc tweaks following upgrading all packages