Improve memory management and start defects