Final Call handling fixes