call handling fixes