Ensure compatibility with d8

Run the framework locally, d8 runs again after this commit.