More upgrade clarifications #331