more unicore changes