fix autocreate, discovery, some other bugs