assorted minor fixes