Fixes based on https://opencast.jira.com/source/cru/CR-MH-512