Config overrides

Resolves #673