Mediacore Integration Followup

Followed up from Stuarts branch with some additional testing and fixes.