[master 0/2] a couple of miscellaneous patches