Minor changes
Finish 2.0.6.2