Minor fixes for data table