CS fixes
Travis improvements