More discovery fixin