Fix version conditionals

I did this in the Github UI, so I had to make one commit for each file.