Bugfixes for non --enable-everything