Compilation fixes for 3.14+

Summary: Compilation fixes for 3.14+

Test Plan:

Reviewers:

CC:

Task ID: #

Blame Rev: