Fixes on data binding