WIP: upgrade tweaks