Fixes for transmitting