Fixes for table cols stuff
Merge pull request #1000 from ahomatthew/develop

Fixes for table cols stuff