Generic fixes.
Merge branch 'config'