Repository changes and more fixes.