Avoid config key clashes

Fixes #48