Remove some warnings.  Only easy ones.

Signed-off-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles