DAR-1727, add fixes after code review