Fixing issues related to Config refactor issues.  See issue #20