Broadway/BroadwayClient: Updates and cleanups