Various CS fixes