CS fixes and travis