another set of various small fixes