Security reviews from ccs fix