Fixed table issues