Try to fix up caching issues.
Fix up error messages (and broken test) in updates.