Errors after upgrade from 2.2.0 to 2.3.1