subscribe fixes