Fix up config a bit