Fix up configs a bit more