Misc fix
Revert discovery non-block, causing some issues