Fix some 2.0 -> 3.0 upgrade issues