Defect Fixes for Content