some fixes for Observer mechanism