Few memory management updates, still getting ECalComponent returning as string error.