Metadata fixed
Reporting tables fixed