Fix table issues