More EL7 fixes