Last changes before memspa-forking