Merge some bare-repo related fixes from Dirk Neumann.