Update compatibility with 1.10.x