- Fix minor bugs