Various core updates etc