Fix build on 8.X