Consistency fixes and preparing to create a new repo.