And fixes again to the observer...