Fixed failures to unregister for block based observation in several places.