Fixed content_type issues