Merge "Fix various memory errors."