Fixed jira issues