Fix and upgrade specs