Minor updates to dynamic discovery