fixes to make standup work for taras