CS fixes
Minor travis improvement