[PATCH 0/2] a couple of changes