Fixed config syntax to allow better overriding.