Bugfixes to databinding.