- Fix some minor bug