Hotfixes for the two-way binding functionality.