Trivial changes to avoid warnings by some compilers

Signed-off-by: Huang Le <4tarhl@gmail.com>