fixes to allow easier integration with media stuff