two more fixes during the init phase of the new repo restored