Fixes in metedata