adapt to new core prototypes, small fixs