Fix compilation errors/warnings after 1.10 merge.

Signed-off-by: Rob Caelers <rob.caelers@gmail.com>