Fix minor bugs 2.