a couple of post-merge fixes