Adding some minor adjustments
Merge pull request #1839 from aRn0D/bundle/config

Adding some minor adjustments