Fixing bugs in subscription management code.