Small fixes in HTTP charset issues