Metadata and bug fixes