several CS fixes