Table and figure fix