[jh] a couple of changes