Minor changes from the general version of Table.cpp