Merge "Fix some memory leaks, potential errors."