CS fixes
Travis improvement