Fixed upgrade table, finally