Fix more versioning stuff