Changes to media and events and fixes