- a few trivial fixes