Add two trivial fixes from old commits