Fix up cornerstone repos