[CORE] Correct few leaks