Changes to compile with talker/listener disabled