Rolled in the discoverer, + bugfix