* Comms fixes (4/30)