cs fixes
travis problems