CS Fixes And Travis Tweaks