RedHat build fixes