Post master-merge and test fixups