Fix clazy warnings

Authored by jbbgameich on May 3 2020, 8:55 AM.