fixes more breakage for send trait changes