Cdituri/core/b2f0fa8 bisect fix

b2f0fa8 broke my mini-build:
``./configure --without-mysql --without-postgresql --without-libxml2 --without-libvirt --without-libacl --enable-debug --disable-silent-rules``

These nitpicks fix it.