ACCUMULO-1152 fixed some bugs