Aprox koji bugs merge

This should fix sbadakhc/kojak#33 (though I haven't run it with an absolutely pristine VM yet)