A few simple but useful fix: 2.0.8

These are few simple but useful fix, hope it helpful for you.