Some small server-side modifications to add xtrace propagation