Fixes from compiling with -Wall

Signed-off-by: Ian Main <imain@redhat.com>