More fixes for make check