Minor changes to publishers/subscribers