Jirabot fixes