trivial fixes 2x