DF-3435 fixes after review