Fix up configs.
Merge branch 'feature/docs'