Fix version conditions