[DF-4841] Another fixes after review