Build changes required for Fedora and CentOS