Fix and small further memory reduction