A couple of trivial fixes