Fixes to get "make check" run on SUSE