Fix some subscriber issues