Fixing bugs for observer mode scenario