Yet more packaging problems fixed.