- Fixed crashes from 1.17.0