Merged extra data fixes