Miscellaneous cleanups

Summary:

Test Plan:

Reviewers:

CC: