Fixed Jira Issues