Fix the issues in JIRA build