cherry: a few config changes