Some more errors seen when migrating from 2.4 to 2.6