Minor: Fix some compiler warnings
(cherry picked from commit e7ae21b97921c30592a1fd956818441aec238896)