[Bug Fix] Fix some minor bugs