[PATCH 0/2] A couple of trivial patches