Memory concerned fixes.