Various tries to fix issue #97: OOM