DAR-1602, add fixes after code review feedback