Fix other finite deprecation warnings