Content type fixes