Minor cleanup of recv's