updates to sufia and fixes for #9372, #9374, #9375