Fix more versioning conflicts