fix warnings emitted by clang

Don't pull yet - more commits are coming. I am just pushing this to get the autotester results.