table2 and manage blocks fixes