TRIVIAL fixes