Some minor config changes