Fix yum upgrade issues