Fix up the rpm and yum helpers