minor fixes
Merge branch 'new-xdm' of https://github.com/dsukhoroslov/bagri.git into new-xdm