Prepare for v8 upgrade