Fix some lint problems

Test Plan:
- None