CS Fixes And Travis Improvements