Fixing Data Binding issues