Content Management defect fixes