Minor compilation fixes

A couple of minor fixes.  Tested with make check, no regressions.