Fixes for adding charset to content-type and accept headers