Fix the data bindings