Fix oopses from 2.0 backporting