Fix request metadata bugs introduced in 2.0.0