Additional fixes for buffe build on Fedora. Submitted as https://bugzilla.redhat.com/show_bug.cgi?id=462982