Discovery bug fixes