Config file changes and small API changes.