CS fixes after PR merge