More trivial fixes