Fix to3000 upgrade issues