Address PushObserver feedback

from #566