[DF-278] tweaks after merge