Analyse and fix last errors

---

Migrated from T174 (view on Phabricator)