Various small bug fixes/jira tickets