Couple of fixes and minor refactoring.

Слиты xottab-duty запросил слияние github/fork/vamit611/xd_dev в xd_dev

Created by: vamit611