Fix 'make check' and template compatiblity.