[Fedora-directory-devel] A couple of build cleanups