Various core changes and additions