Fix `make check` errrors