Improve handling of MultimediaManager to make it a bit easier to make a 'basic' build