Fixes/rewrites for content-type