[DF-2911] Fixes according to review