Clean up voice call fixes