! Minor upgrade tweaks