Fixed bugs for Cornerstone