Fixes for compatibility with zero configuration Jira