Lots of updates for cross-client testing