Fix finite deprecation warnings