Some minor changes regarding the Observer.