Fix minor bugs
Fix minor bugs