Jira big fixes