More spec 3 upgrade changes