Fix version cehcks, etc