Fixing issues after jira upgrade