Few observeEach fixes