Fixing media related issues