More fixes to the suggested default configuration in prod.