Lint warning fixes

Test Plan:
- None