Fix some Jira issues