- Fix inject send for snd/rma
- Implement wait/control