few assorted adjustments and a fix for #8883