Fixed some issues with Fedora 17 building
Merge remote-tracking branch 'skottler/f17_fixups'