Fixed repoman issues