Various ccss changes