Where possible the buffer manager properties should be better differentiated. Instead of max-buffer-space for example, we could have max-buffer-disk-space-mb.