Fix some things, put jira back