various trivial fixes