[DF-3756] Fixes according to review