Fix some 'make check' warnings