Metadata update and bug fixes