Various cahnges to make repo consistent.