Fix a few compile-time warnings

TBR