Minor pre-merge updates