[DF-900] small fixes