Fix invalid references

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 8ac1796226c3239bd48d05f7a043b29ad71a272a)