Fixed a lot of JIRA tickets