Sender and sync improvements