Worked on changes due to moves to a repo.