JIRA-1970 small fixes