Fixed fresh clone bugs