HR-325 additional fixes