minor tweaks on Inspect initialization
Merge branch 'develop'