CS fixes
Updated the change log