Small CS fixes after PR merge