Fix common-multimedia-suite