Fixed a little bit the metadata system.