Fixed major issues with discovery