EST-241: various minor issues on unique keys/indexes