Fix some issues and typo