Fixes to input data table definitions