Fix more DataBindings