Two way data binding fixes.