Fix build errors after refactoring AddBinding