Clean up some nits and fix PrepareForSending