TONY: Fix clang warnings - Courtesy of LordHoto
TONY: Revert 60980e783ef263f3ed5aa708dc3032779d3be923