Merge pull request #690 from cristianoc72/config-issues

Fix Propel TreeBuilder
Fix issue #676

Fix #676 and #668