Some trivial fixes