Juggle versions to make everyone happy

For consideration --- don't merge just yet, I don't know yet whether these versions cause any issue.