Fix some more new warnings.

Testing Done:
Compiles these files and see less warnings.

Reviewed at https://reviews.imfreedom.org/r/219/