Tweak content type checks