Multimedia fixes

Bug introduced by 329961e783a8545d1904e8009938089cb6799904 and reported as #4897