Fix build warning/failure in fedora 22 rawhide

Hopefully, the commit messages say it all.