Reduce memory pressure a bit
Fix defaults to match upstream more closely