Mainly CS fixes