Fixes for datagrid component update