Just some Discovery fixes.