Libcheck adaptation