Minor fixes
Fix bug when parsing content-type headers with charset