Some repoman fixes