- Fix some minor bugs