CS fixes
more travis stuff