Minor config-related adjustments