Clean and upgrade ... still two failures