More content fixing