trivial fixes part 1