Fix bugs: Number 2- 3.
Fix bugs: Number 2- 3.