Cosmetics/trivial fixes (new release 3.97)