Various core changes