[DF-4476] Other fixes after review