Fixes for table cols stuff