Changes to upgrade to fedora 18