Update for various D8 changes