- Some adjustements in mem functions