CS Fixes
Travis improvements