Fix subscriber bugs