Tb cs fix

These are the changes we work on at my desk.