RC1 updates, missed by earlier commit