Minor changes
Changes from Ioan review
Merge branch 'simple_setup_improvements' into lightning_framework
Small fix
Changes from Ioan review
Merge branch 'simple_setup_improvements' into lightning_framework
Fix path bug