Some quick changes from a live-hack session on prod after enabling PulseWire.