Fix CS and travis config