More CS fixes #37