Small fixes in the event layer for the observer