Changes to persRepo and more fixes