CS Issues Fixed