fix some bug so app ready to clone