Data binding bug fixes and enhancements