fixups for make check
fixups