fixes to address JIRA issues