Remove unnecessary observer waits
Merge pull request #144 from ekr/MS_fix_observers2

Ms fix observers2