Minor upgrader fixes