Minor changes to support development of DataProfiler