more trivial fixes