[DF-31] Some fixes

Fixes according DF-31 subtasks