Update changelog
Fix cs