Various minor config changes