Fix up content parsing