Fixes in databinding