Fixes for regressions introduced when fixing CNY-3437
Fixes for regressions introduced when fixing CNY-3437

fedora-conary/conary,fedora-conary/conary,fedora-conary/conary,fedora-conary/conary,fedora-conary/conary