Fix Buchi memory usage