Couple of trivial fixes