CS fixes and bump version number after PR merge