Minor fixes
Bump 1.0.7