torbenh's buffer manager fixes from 3.0P