Fixes for Fedora 17.