Media type fixes