More woes with update choreography
Merging with bus related changes