A few fixes on table