Fixed last upgrade problems and typo.