Update specs, fix CS