More v8 upgrade stuff.