Bugfixes for observation