Fix subscription bugs