A few minor fixes

Hi David,

A few more warnings fixed. Nothing major, just me keeping things clean.

Cheers,

Christian