Bootstrap fixes
Fixes on configuration dist
Add exceptions to cli script