Various fixes
Increment version to v1.0.6