Fix up compiler warnings