Perform small improvements for pub/sub module.