Problems after upgrade from 2.0 to 2.2