More work to try and make repoman work