Update changelog and fix CS