[DF-2672] Fixes after review.