[OEM-168] Fix sending bugs, manual test
[OEM-168] Close off, merging in Jamie's changes