[DF-3075] Fixes according to code-review