Fixed Jira issues