Some fixes to fedora 18