Fixed some issues with cross tables.