Some metadata and fixes