Legacy upgrader fixes