Minor updates to Transmitter