A few cs fixes