Fixes for make check.