Listen broadcast publish fixes